Fix console output and bug in evtchn_ia64 (by Tristan Gingold)

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
index ac8ff9ec4cec141daae3d2a80ddea9957d343e4c..236881e3fe178acce877fa998ecff90d4b3f2a36 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
@@ -22,6 +22,7 @@ unsigned int bind_virq_to_evtchn(int virq)
 
     op.cmd = EVTCHNOP_bind_virq;
     op.u.bind_virq.virq = virq;
+    op.u.bind_virq.vcpu = 0;
     if ( HYPERVISOR_event_channel_op(&op) != 0 )
         BUG();
 

diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
index 12e9a018b0509e819fd93b398431fd7d694c3b2a..d9b30e633bc406f7a460306ef9587f4992fa93f0 100644 (file)
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
@@ -1,7 +1,16 @@
-diff -Naur xen/console/console.c xen.patched/console/console.c
---- xen/console/console.c      2005-09-23 10:54:50.000000000 -0600
-+++ xen.patched/console/console.c      2005-09-23 10:57:51.000000000 -0600
-@@ -768,9 +768,16 @@
+--- xen/console/console.c      2005-11-02 14:13:07.000000000 +0100
++++ xen.patched/console/console.c      2005-11-02 14:21:20.000000000 +0100
+@@ -196,6 +196,9 @@
+ void xen_console_init(void)
+ #endif
+ {
++      if (xen_init() < 0)
++              return __RETCODE;
++
+       if (xen_start_info->flags & SIF_INITDOMAIN) {
+               if (xc_mode == XC_DEFAULT)
+                       xc_mode = XC_SERIAL;
+@@ -768,9 +771,15 @@
  #endif
  
        if (xen_start_info->flags & SIF_INITDOMAIN) {
@@ -10,8 +19,7 @@ diff -Naur xen/console/console.c xen.patched/console/console.c
 +              bind_evtchn_to_irqhandler(xencons_priv_irq,
 +                              xencons_priv_interrupt, 0, "console", NULL);
 +#else
-+
-               xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE);
+               xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0);
                (void)request_irq(xencons_priv_irq,
                                  xencons_priv_interrupt, 0, "console", NULL);
 +#endif